ChangeLog fix

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1ab59f58fc1b05b451f3829c180e5fad22830a0..d2987364fa5ed2d48938efb2a688b956cc4bde8b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1942,7 +1942,6 @@
        * net/shr.el (shr-tag-img): Prefer the title over the alt text
        (bug#16537).
 
->>>>>>> MERGE-SOURCE
 2014-01-24  Juanma Barranquero  <lekktu@gmail.com>
 
        * net/eww.el (eww-download-callback):